Merge "Preliminary support for clipRect(Rect, Op)"