Merge "Fixes GestureLauncherService triggering on long press."