Merge "Prevents showing Guests in switcher." into pi-dev