Merge "Fix crash in TextInputLayout's counter view" into mnc-ub-dev