Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev