Merge "Unwrap our DrawableWrapper impls in canSafelyMutateDrawable()" into mnc-ub-dev