Merge "Removing unused SplitClockView" into main