Merge "Make QS pull down consistent with shade" into sc-qpr1-dev