Merge "Fix hard edge on charging ripple." into sc-qpr1-dev