Merge "Don't cancel or commit predictive back on multi touch in 3-button-nav" into main