Merge "Tidy up TextInputLayout.setError()" into nyc-dev