Merge "Fix issue with drawColor(color, Mode.Clear)"