Merge "Xml: Simplify processing of attributes in Xml::label"