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