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

Change-Id: I2e21a51ccff5961c36db236d1aec6386f2252a76