Merge "Allow AppCompat to inflate all framework views" into mnc-ub-dev