Merge "Correct QuickStep interaction handler." into sc-dev