Merge "Add AlbumColumns.ARTIST_ID." into qt-dev