Merge "Maybe fix flaky testDetachCalledWhenDestroyFragment" into nyc-support-25.2-dev