Merge "Removing workaround for battery defender" into ub-launcher3-master