Merge "Add wait flag to am switch-user command."