Merge "Record app<->device association to xml file"