Merge "Fix TextInputLayout regressions" into nyc-support-24.1-dev