Merge "Added the default format and ordering of columns for TimePicker" into nyc-support-25.2-dev