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