Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev