Merge "Fix predictive back progress animating the opposite direction" into main