Merge "Fix crash for predictive back to home fallback animation" into main