Merge "Change default long-press time to 400ms"
am: b96cbedfb2

Change-Id: I953076ce2fe44fb96f2cfbd60e771694c225fc99