Merge "Disable switching users until user 0 is unlocked" into nyc-dev