Merge "Clean up TimePicker"