Increased layout timeout to handle older devices
am: bba8ae544c

Change-Id: I3d54e5f8c1c19c23466c6f649ac7b430106c1af5