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

Change-Id: Ibb19ab5bdf094a250706b2d32de169f61c221a76