Merge commit 'origin/gallium-context-transfers-2'