Merge "Changed the way that date format selector is shown."