Merge pull request #4020 from elupus/upnpplayer

UPnP player disconnect/attach improvements
FIX: [droid] prevent the os from shutting us down if a touchpad device is added/removed
Merge pull request #4053 from koying/quickpr

FIX: [droid] prevent the os from shutting us down if a touchpad device i...
AE: add settings to enable ac3 transcode and upmix via ac3 transcoding
ActiveAE: implement settings for ac3 transcode and upmix
AE: rename setting speaker configuration
Strings: Update description and setting name for multi thread frame decoding
DVDVideoCodecFFmpeg: Disable hw acceleration when frame threading is enabled
Settings: Disable vdpau / vaapi / dxva2 / openmax if frame threading is selected
fixed: crash on exit when playing a file via upnp's "play with" (fixes #14559). We called stop on a player (upnp) which service was already stopped.
Merge pull request #4025 from FernetMenta/audiopage

AE: add settings for ac3 transcode and ac3 upmix
fixed: Only force cache for video else it may cause a thread-storm
Merge pull request #4027 from arnova/file_cache_not_for_all_fix

fixed: Only force cache for video else it may cause a thread-storm
changed: Enable multicache for mkv files (fixes #13841)
changed: We should always check for multistream when caching
Merge pull request #3963 from arnova/mkv_multi_cache

changed: Enable multicache for mkv files (fixes #13841)
Merge pull request #4056 from wsoltys/fix_upnp_crash

fixed: crash on exit when playing a file via upnp's "play with"
Merge pull request #3950 from fritsch/warning-text

Don't use hw decoders when doing multithreaded decoding
(dvd/omx)player: make sure we restore output timestamps for text based subs