Merge "Add predictive back animation for 3-button-nav" into main