Merge "Allow QuickstepTransitionManager to be overridden" into tm-qpr-dev