Merge "Make all icon fields & extras sent to listeners backward-compatible." into mnc-dev