Merge changes from topic "am-1de652e5-383f-4291-b4b5-dee384ddf1ba" into ub-launcher3-master

* changes:
  [automerger] Fixing widgets not getting restored when the corresponding system app is enabled am: adaf210794
  Fixing widgets not getting restored when the corresponding system app is enabled