Merge "Don't allow users to be switched on keyguard when multiple users is disabled" into udc-dev