Merge "Refactor QuickStepController into Gestures"