Merge "battery: handle early/late suspend/resume of i2c bus"