Merge "TextInputLayout fixes" into lmp-mr1-ub-dev