Merge "Make user switching dialog cover top part of the screen as well." into udc-dev