Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev