Merge "don't toggle between Paint and SkPaint"