Merge "Some fixes for TextInputLayout" into mnc-dev