Merge "Fix clock being clipped when scaled down in new customization picker ui" into main