Merge \"Decrease default longpress timeout to 400ms.\" into nyc-mr1-dev
am: c3bdde9790

Change-Id: I4c4a3239435d45a4ace79e616d4fd5c436a79073