Merge "Refactor code to support overridden low battery warning"