Merge "Date/time pickers and calendar view not handling locale change."