am 5be52fb5: am a0c9b9d2: Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev

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