Merge "Don't broadcast <Standby> message during shutdown when setting is disabled" into nyc-dev