Merge "Cherry-pick: gpu: Add missing ScopedRenderTo" into m38