videodb: fix LoadVideoInfo (for real this time)
videodb: only update file paths if there's not an updated path already in the database (fixes #13493)
[pvr] remove hardcoded keymap in fullscreen video playback add possibility for PVR specific keymaps with a fallback to the default FullscreenVideo bindings if no PVR specific are found
Merge pull request #1727 from npeacock/xbmcmaster-wip

Touch Input: Fix for touch screen input in Linux to see presses as mouse...
fix order of tags in files with multiple tags so that xiph > id3v2 and ape > id3v2 if prioritising of ape tags is on
Don't delete paths that have exclude or strSettings set and
don't delete paths that are refered to by other tables as parentID
content = "none" no longer is atest for excluded folder use path.exclude

if the user attempts to set the content of a folder in a sub-folder of an excluded
folder they will now correctly get the scraper set to none with the excluded
option set
[confluence] switch a ListItem.Property(Fanart_Image) to ListItem.Art(fanart)
ensure ListItem.Art(thumb) updates when poster/banner update in the video info dialog
media library: switch to the playlist view matching the currently active view (fixes #12891)
[pvr] fixed - don't hold a lock while creating an add-on instance
[pvr] fixed - start and stop the pvr manager via app messenger when updating the guisetting. pvr may create a dialog or kaitoast notification, leading to a deadlock
[pvr] add dedicated actions for channel up/down and make them globally available via cActions
FIX: Properly handle Pictures Play/Stop notif (fixes #13501; fixes #13503)
Merge pull request #1737 from Montellese/fix_12891

media library: switch to the playlist view matching the currently active view
Merge pull request #1724 from da-anda/pvr-keymap

[pvr] remove hardcoded keymap in fullscreen video playback
rpc: add OnScanStarted/Finished notifications
upnp: disable notifications while cleaning dbs
Merge pull request #1738 from koying/fixpicturenotif

properly handle pictures Player.OnPlay/OnStop notifications (fixes #13501; fixes #13503)
[fix] reset subtitle delay on activation of new sub file from python, lost in b14343ba922ef4425e1fdff99b142747e4215b7a