[music] allow SortByYear to sort by year, album, track, then label
[pvr] setting: enable option 'Close channel OSD after switching channels' by default
Merge pull request #4918 from jmarshallnz/year_album_track

[music] allow SortByYear to sort by year, album, track, then label
Merge pull request #4973 from xhaggi/pvr-setting-closechannelosdonswitch

[pvr] setting: enable option 'Close channel OSD after switching channels' by default