Merge "Disable battery defender to avoid locking during the test" into ub-launcher3-master