Merge "Add extra waiting when switching users" into nyc-dev