Merge "Don't crash when recreating ZenModeTimePickerFragment" into main