Merge "Allow use of theme attributes in color state lists"