Merge \"Add extra waiting when switching users\" into nyc-dev
am: 4d6be6b308

Change-Id: Ibf3fc8f0176e2d02fe3548146928c9b66986e428