Merge "Changed the default if the notification time is shown" into nyc-dev