Merge "Correctly clip QS during heads-up pull down" into sc-qpr1-dev