Merge "Fixed a bug where the dozemode was incorrectly applied" into nyc-dev