Merge "Don't pilfer pointers with 3-button-nav predictive back" into main