Merge "Small TextInputLayout label fixes" into nyc-support-25.1-dev