Merge "Clock customization screen (1/3)" into main