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

Change-Id: If2c4fa92842c08501b90f3da6bc972e4ba32c6a8