Merge "Disable RenderThread"