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

Change-Id: Ib20db3e3e8111ca98b586adbcb83b65a5764f860