Merge "Revert "Revert "Update Readback VTS to align with RenderEngine i..."" into sc-dev