Merge "Fix onUserInteraction not called with 3-button-nav and enableOnBackInvokedCallback=true" into main