Merge "ClockPickerViewModelTest" into main