Merge "Don't lock down system user in demo mode" into oc-dr1-dev