Merge "Remove scissor tests."