Merge "Return to previous RenderEngine behavior for protected buffers" into sc-dev