Merge "Update predictive back progress interpolator" into main