Merge "Update to latest UX margins for clock... and much more" into sc-dev