Merge "Revert "Temporary fix for Folders in battery saver mode."" into ub-launcher3-dorval