Merge "Fixes for TextInputLayout" into mnc-ub-dev