Merge "Add the charging ripple effect, currently guarded by flag_charging_ripple." into sc-dev