power: battery: merge last changes from Quarx