Merge branch 'master' into android-new-control-input-overlay Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java