Merge "Update TimePicker widget and its related dialog"