Merge "QS: Followup to scroll fixes" into nyc-dev am: 1ceef7c0fa
am: 13edc468d6

* commit '13edc468d6ac2a8ac2ccafcd06053af883a248f6':

Change-Id: I2ca7c1e8739e218cae4336039f43fd829ed39906