Merge "Restrict Settings always-on to NYC+" into nyc-dev