Merge "Clock thumbnail on clock customization entry" into main