Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev