Merge "Resolve color xml attributes properly." into lmp-dev