Merge "Simplifies show/dismiss logic for the full screen user switcher."