Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev