Merge "Make clock editor support blueprint clock view in new customization picker" into main