am fe6e733a: Merge change 20960 into donut

Merge commit 'fe6e733a01b1ab8a6c7b651c65bf7abeb97f9525'

* commit 'fe6e733a01b1ab8a6c7b651c65bf7abeb97f9525':
  Fix issue #2049588: App widget can crash causing system to be unable to boot