Merge "Unwrap ScaleDrawables when checking for safe mutate()" into mnc-ub-dev