Merge "Fix TextInputLayout clearing the EditText tint" into mnc-ub-dev