Merge "Keep clock below other UI elements" into tm-qpr-dev