Merge changes I7a3ba2af,Ifa89ae43 into sc-dev

* changes:
  Fix app widget deadlock when toggling overlays
  Revert "Revert "Apply overlay updates to widget provider info""