Merge remote-tracking branch 'remotes/upstream/MP1-1961-REWORK-Music_Thumbs_Handling' into 1.7.0Fork-BDJ

Conflicts:
	mediaportal/WindowPlugins/GUIMusic/GUIMusicFiles.cs