Merge "Fix invalid style reference in xml"