Merge change 20960 into donut

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