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

Change-Id: I703cb476b5e3cff50a266775ece86d954981cde0