Merge branch 'master' into android-new-control-input-overlay Conflicts: Source/Core/DolphinWX/Src/Android/ButtonManager.h