Merge "Fix predictive back animations jump at beginning" into main