factor out the UI scaling computation from SetScalingResolution
use GetGUIScaling rather than SetScalingResolution when computing font size so as to not alter stored state
[pvr] bump add-ons (fix version of addon.gui)
FIX: [stagefright] proper SurfaceTexture allocation
FIX: [stagefright] fixes and refactors (probable fix for 60min stuttering)
FIX: [droid] Handle mouse wheel
use correct settings descripting text for screensaver fixes #14691
fixed: Compile error with FileFactory test + cosmetics
FIX: fixups std::string rfind + npos
Merge pull request #3659 from koying/quickpr2

FIX: fixups std::string rfind + npos
fixed: Compile error in test for StringUtils::Format
[musicdb] fix: fix support for .nfos and better handling for scrapers that don't return artist credits

The real underlying cause here is the change in the structure of the .nfo files.
That should be documented so folks start to update their .nfos and other scrapers.
[WIN32] removed unused methods and some CStdString occurrence.
Merge pull request #3657 from koying/quickpr

Stagefright fixes
[lang] update of internal addon language files
[lang] update of core language files
[lang] update of skin.confluence language files
[lang] added new language Tajik
Merge pull request #3656 from FernetMenta/addongui

[pvr] bump add-ons (fix version of addon.gui)
FIX: [droid] do not package non-standard joystick keymap