Merge "Disable lock screen by default for demo users" into oc-dr1-dev