Merge "Use new full screen user switching dialog on TV" into udc-dev