Merge "Fix issue with DrawableCompat.wrap() + mutation" into mnc-ub-dev