Merge "Fix close animation issue during predictive back / swipe up" into main