am 637e776b: am 8783d3fe: Make all icon fields & extras sent to listeners backward-compatible.

* commit '637e776b2ad5048f3d76dad0e1d6992ad6233251':
  Make all icon fields & extras sent to listeners backward-compatible.