Merge "Fix crash on L+ when using TextInputLayout" into mnc-ub-dev