Merge "Optimizations for AppCompat + VDC integration" into mnc-ub-dev