Merge "Include current selection mode in TimePicker event text" into nyc-dev