Merge "Hook picker default clock up to FlexClockView" into main