Merge "power: qpnp-bms: Fix SoC smoothing upon resume"