Merge "Overdraw avoidance and merging of clipped ops"