Merge "Changed the name of chronometer countdown" into nyc-dev