Merge "Make app:textAllCaps="false" override android:textAllCaps" into mnc-ub-dev