Merge "Polish predictive back with 3-button-nav" into main