Merge "Fix clock is low in new picker customization UI" into main