am b832dfe7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit 'b832dfe72f1bbdec778b50f258eae29f17fd8e0b':
  Temporarily restore some support for icon==0 notifications.