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