Merge "Fix WindowOnBackInvokedDispatcherTest flake" into main