Merge "Revert "Show bouncer after user switch"" into udc-dev