Merge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev