Merge "Update the TimePicker hour format when toggling 24-hour mode"