Merge "QS: Followup to scroll fixes" into nyc-dev am: 1ceef7c0fa am: 13edc468d6
am: aa63a64aae
* commit 'aa63a64aae8f85486a27fb2e2aa6a017a945ada8':
Change-Id: Ibffb47a4d7d369b0f38a421dd20ad7e9f9048fe2
This commit is contained in: