Merge "Minor cleanup in WindowOnBackInvokedDispatcher" into main