Merge "QS: Followup to scroll fixes" into nyc-dev