am 4d19a860: Merge "Make all icon fields & extras sent to listeners...
am 4d19a860: Merge "Make all icon fields & extras sent to listeners backward-compatible." into mnc-dev
* commit '4d19a860':
Make all icon fields & extras sent to listeners backward-compatible.