Merge "Wait for keyguard to be shown before completing the user switch." into udc-dev