Merge "Add owner to the connected device folder"