Merge "EdgeBackGestureHandler finds launcher properly"