Merge "Fix various draw ops that may incorrectly not scissor"