Merge "Correctly clip QS during heads-up pull down"