Merge "Revert "Fix onUserInteraction not called with 3-button-nav and e..."" into main