Merge "Update AppCompat + Design public declarations" into mnc-ub-dev