Merge "Disable some QS functionality in retail demo mode." into nyc-mr1-dev