Merge "Refactor battery warning code to make it easier to read"