Merge "Fix "swipe up to switch apps" pop up displaying in SUW while creating...
Merge "Fix "swipe up to switch apps" pop up displaying in SUW while creating second user." into pi-dev am: dd12d339
am: 407a2c1f
Change-Id: I6ecd89d81d2cfe344289489292f73d553409d115