Merge pull request #4522 from Montellese/platinum_missing_patch

platinum: add missing patch file
Merge pull request #4517 from t-nelson/no_invisible_or_disabled_settings_for_json

Don't expose invisible settings to JSONRPC
Merge pull request #4523 from koying/fixamcinitformat

FIX: [mediacodec] proper initialization of output format
Merge pull request #4533 from Memphiz/removetoast

[gl/gles] - remove annoying kai toast in videofilter fallback case
Merge pull request #4514 from joethefox/jsonrpc_subtitle_addontype

JSON-RPC: add "xbmc.subtitle.module" enum in the json-rpc Addon.Types se...
Merge pull request #4297 from maxwellito/wiimote_battery_fix

Fix Wiimote battery problem
Merge pull request #4535 from Memphiz/fixchannelmap

[osxsink] - fix bad access when device announces more then 8 channels - ...
Merge pull request #4524 from koying/fixamcinbuffer

FIX: [mediacodec] reset if we are out of input buffers
Merge pull request #4503 from popcornmix/texture_leak

[rbp] Fixes for hangs and leaks in jpeg->texture code
Merge pull request #4534 from popcornmix/dvdplayer_merge

[omxplayer] merge missed commits from dvdplayer
Merge pull request #4541 from xhaggi/continue-last-channel-on-wakeup

[pvr] continue last played channel on wake up
Merge pull request #4350 from Memphiz/iosbgmusic

[ios] - restore the music background playback ability
Merge pull request #4545 from Memphiz/nfsexportlist

[win32] - nfs fix
Revert "[osxsink] - fix bad access when device announces more then 8 channels - fixes #15065"

This reverts commit b7509ea8dc3c003825b33719cbc2445093b1145f.
Revert "[ios] - remove the audiosession handling from the sink - its handled in the UIApplication already"

This reverts commit 69db028a62c700f957f6afd16ea0081124b8380f.
Partially revert changes to AESinkDARWINIOS.* from "AESink: Revisit volume part 2"
Revert "[osxsink] - for devices which report samplerate 0hz - allow user override with 44.1khz and 48khz" (pull request #4467)

This reverts commit e2cff35c794a7b7a6be6d22eb56ca8c45eda5665.
Revert "[darwinsink] - increase the initial startup timeout of the sinks to 4500ms and log error case" (pull request #4471)

This reverts commit 714e7f2c0d81371c02945ef80549a65f289fe4b7.
Revert "[osxsink] - always fetch the defaultdevice from osx instead of or (maybe"

This reverts commit 753e70826c7d28ab827843afcd96aa6dc31ff0d8.
Revert "[osxsink/iossink] - don't spam the log with audiobuffer underruns with 0 bytes available - those underruns happen alot when we idle but sink isn't suspended yet - instead only log those underruns once until there was some data played again"

This reverts commit 943845f5a9005b737532178d562b39058d1da542.