Merge "Fix NPE in DrawableCompat" into mnc-ub-dev