Merge "Drag in the EditText's hint colors in TextInputLayout" into lmp-mr1-ub-dev