Merge "Add trailing '/' to MediaColumns.RELATIVE_PATH" into qt-dev