Merge "Fix flicker in predictive back to home animation" into main