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