Merge "Fix large clock not changing font size when the screen rotates" into main