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