Merge "Cleanup cached state in TestUtils::runOnRenderThread" into nyc-dev