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

Change-Id: I8f7aecf370f6cc3d7fb5c701c9110ed977d1f135