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

* commit 'b786d9a33450b42bf937ca193041e35a11be7ca2':
  Fix crash on L+ when using TextInputLayout