Merge "Fixed a bug where the chronometer was invisible" into nyc-dev