Merge "Fix spacing between clock and date" into sc-v2-dev