Merge "Fix large clock overlap with elements on lockscreen when display/font becomes larger" into main