Merge "Add a workaround for VectorDrawable issues on API 21" into mnc-ub-dev