Merge "Bug fix: GestureLauncherService is disabled incorrectly"