Merge "Fix AppCompat + textPassword (again)" into mnc-ub-dev