Merge \"Merge \\\"Add extra waiting when switching users\\\" into nyc-dev am:...
Merge \"Merge \\\"Add extra waiting when switching users\\\" into nyc-dev am: 4d6be6b308 am: 3f8ae5a2\" into nyc-mr1-dev-plus-aosp
am: 837aac6c
Change-Id: I4ba520c3fc42c6ab633b2f6b6a8f3dd89b520453