Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev