Merge "Avoid playing the charging ripple on reboot." into sc-dev