Merge "Temporary fix for Folders in battery saver mode." into ub-launcher3-dorval
am: 29318b1aa6

Change-Id: Ib69faba80d7dcba68f5b92c2db9defd09a209569