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

Change-Id: I7a0b5216e5551223b626b0ab1c7addf4cec2463c