Merge "Remove usage of status_bar_height in clocks" into main