* commit '509e5db14908f85c1ad4b93e8bbed5afd4c2c8fe': Resolve color xml attributes properly. [DO NOT MERGE]