Merge "Delete disconnected row when the corresponding remote file is deleted in a MTP device." into nyc-dev