Merge "Replace default clock with FlexClockView" into main