Merge "Fix scissor tests failing on 565."