Merge "Better event handling when coming from a trackpad." into arc-apps
am: 14b30ae40a

Change-Id: I47fe8abf63a05285e039e4b66178e1bcab639aa7