Merge "Fix disabling lockscreen for demo users." into nyc-mr1-dev