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