Merge "Lockdown settings in retail demo mode" into nyc-mr1-dev