Merge "Revert "Removing workaround for battery defender"" into sc-dev