Merge "Add attribute, theme values for error text color"