am 158d57a5: Merge "Optimizations in the notification list:" into jb-mr2-dev

* commit '158d57a5d1820cd1c4479ab71da55c8840a964e1':
  Optimizations in the notification list: