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