[DO NOT MERGE] Increased user switch timeout to 3s
am: 2fe1990ba7

Change-Id: I0c33b2804fe41885c02567d3ed5208993b46086a