Merge "Refactor and fix flaky tests in WindowOnBackInvokedDispatcherTest" into udc-dev