Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev