Merge "Disallow safe boot when in demo mode" into nyc-mr1-dev