Merge "Better event handling when coming from a trackpad." into arc-apps