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

Change-Id: I022cb5eb8de2255198957983a8929d151de4d171