Merge "Fix wrong color of clock in preview in picker" into main