Merge "Make the date baseline aligned with the clock baseline" into tm-qpr-dev