Merge "Override buffer always sets blend mode and plane alpha" into sc-dev