Merge "Decouple TimePicker code"