am 5e3e4f9b: am 49ae8f2e: am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev

* commit '5e3e4f9b5832c4ddf3a4ad1944622966351e6ffe':
  Crash apps with bad notification icons.