* commit '6c1bf6b161cf3c18b49831eba71811d3fa00d108': Resolve color xml attributes properly. [DO NOT MERGE]