Merge "Prevents showing Guests in switcher." into pi-dev
am: 027a967389

Change-Id: Ib59d45e420e3a05c272cd9bd2a0e0c95b44a6688