Merge "Merge "Fix QS not collapsing after some QQS gestures" into nyc-dev am:...
Merge "Merge "Fix QS not collapsing after some QQS gestures" into nyc-dev am: 12b1776d am: 14d5f852" into nyc-mr1-dev-plus-aosp
am: 62ba4fc7
* commit '62ba4fc7':
Change-Id: I2acec62af8e8e25cc746c8dc947ba6776e76c3dc