Merge "Tidy up DrawableCompat + VDC/AVDC calls" into mnc-ub-dev