Merge "Fix setShadowLayer + drawTextOnPath" into rvc-dev