Merge "Add the correct vertical positioning for clock" into main