Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev