Merge "Crash apps with bad notification icons." into mnc-dev