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

Change-Id: If697d7d9fe6305379d7186425e57b17572e9b30e