Merge "Fix TextInputLayout error being magenta" into nyc-support-24.1-dev