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