Merge "Prevent ANR in apps using drawPath() Bug #10347089" into klp-dev