Merge "Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev