Merge "Revert "Icon support comes to Notification."" into mnc-dev