Merge changes I703ea278,I2c517d0a into nyc-mr1-dev

* changes:
  Fixed a few bugs regarding big notification groups
  Fixed a bug where the scroller would stop tracking