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

Change-Id: I670cf48d1aac97dcf26213d7db5627ac7a1ef654