Merge "Fix TextInputLayout hint not working in extract mode" into nyc-mr1-dev