Merge "Fixing widgets not getting restored when the corresponding system app is enabled" into ub-launcher3-dorval-polish2