Merge "Update TextLayoutCache key for supporting more SkPaint properties"