Merge "Set reset_on_fork in setRenderThread as well" into main