Merge "Update clock top margin" into tm-dev