Merge "power: qpnp-charger: fix charging timer"