Merge "Fix default large clock too high in portrait mode" into main