Merge "Work on issue #27995384: Time in the top bar different..." into nyc-dev