Merge "Fix animation jumps in predictive back system animations" into main