[rebrand] minor @echo @APP_NAME@ instead of kodi/xbmc
CHG: [droid] refactor packaging to allow obb google extension apk
[pvr] Fix unexpected sub channel merge in EPG grid

Using backend channel number, number would be not unique if any sub channel exist.
So don't use it to sense channel breaks. Use unique channel identifier instead.
Merge pull request #5564 from janbar/fix_gridSubChannelMerge

[pvr] Fix unexpected sub channel merge in EPG grid
Merge pull request #5108 from koying/chgdroidobb

[wip] CHG: [droid] refactor packaging to allow obb google extension apk
Merge pull request #5553 from uNiversaI/patch-1

[rebrand] fix minor @echo @APP_NAME@ intead of kodi/xbmc
videoplayer: adapt lateness detection and dropping to buffering
video player: present correct pts to user for a/v sync (after buffering in renderer)
videoplayer: update frametime, it might change due to fps detection
videoplayer: give streams with invalid fps a chance for fps detection
dvdplayer: allow rewinding at end of stream, do a seek after rewind
dvdplayer: observe pts counter overflow
dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer
vdpau: advanced settings for auto deinterlacing
player: fix rewind
fix incorrect display of fps when dr kicks in
ActiveAE: slightly reduce buffer size
Revert "vdpau: comment some features that will be added later"

This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf.
xbmc pr 3080
ActiveAE: add some debug logging