Merge "Bring back time formatting for single line clock" into sc-dev