Merge "Fix clipping for date and time on QS"