Merge changes from topic 'am-588c4b19e0964a4f9dcb9875e12578e2' into nyc-mr1-dev-plus-aosp

* changes:
  Merge changes I703ea278,I2c517d0a into nyc-mr1-dev am: d8fecad3 am: 5a89a106
  Fixed a few bugs regarding big notification groups am: bc243a96 am: 209fb7fc
  Fixed a bug where the scroller would stop tracking am: ecfc6b52 am: 61e4934b