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

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