diff --git a/project/jni/application/supertux/AndroidAppSettings.cfg b/project/jni/application/supertux/AndroidAppSettings.cfg
index 1bf70de7f..2c0e57ad2 100644
--- a/project/jni/application/supertux/AndroidAppSettings.cfg
+++ b/project/jni/application/supertux/AndroidAppSettings.cfg
@@ -33,10 +33,10 @@ AppVersionName="0.6.3.21"
 AppDataDownloadUrl="!!SSL certificates|:ca-certificates.crt:ca-certificates.crt"
 
 # Reset SDL config when updating application to the new version (y) / (n)
-ResetSdlConfigForThisVersion=y
+ResetSdlConfigForThisVersion=n
 
 # Delete application data files when upgrading (specify file/dir paths separated by spaces)
-DeleteFilesOnUpgrade=""
+DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag"
 
 # Here you may type readme text, which will be shown during startup. Format is:
 # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/
@@ -285,6 +285,7 @@ APP_PLATFORM=
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi-v7a arm64-v8a x86 x86_64
+MultiABI='armeabi-v7a arm64-v8a x86 x86_64'
 MultiABI='arm64-v8a'
 
 # Optional shared libraries to compile - removing some of them will save space
@@ -296,7 +297,7 @@ CompiledLibraries="c++_shared SDL2_image SDL2_ttf freetype harfbuzz glm boost_fi
 CustomBuildScript=n
 
 # Aditional CFLAGS for application
-AppCflags='-DGLM_ENABLE_EXPERIMENTAL -DUSE_OPENGLES2 -Ijni/openal/include/AL -Ijni/boost/include -frtti -fexceptions -Oz'
+AppCflags='-DGLM_ENABLE_EXPERIMENTAL -DUSE_OPENGLES2 -DGL_PERFORMANCE_LOG -Ijni/openal/include/AL -Ijni/boost/include -frtti -fexceptions -Oz'
 
 # Aditional C++-specific compiler flags for application, added after AppCflags
 AppCppflags='-std=c++14 -fno-strict-aliasing'
@@ -314,7 +315,7 @@ AppSubdirsBuild='. supertux/src/* supertux/external/findlocale supertux/external
 AppBuildExclude='supertux/external/findlocale/example.c supertux/src/video/sdl supertux/external/SDL_SavePNG/main.c'
 
 # Application command line parameters, including app name as 0-th param
-AppCmdline='./supertux2 --verbose'
+AppCmdline='./supertux2 --verbose --show-fps'
 
 # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens
 # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge
diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux
index a38f0319c..51b2ebaa1 160000
--- a/project/jni/application/supertux/supertux
+++ b/project/jni/application/supertux/supertux
@@ -1 +1 @@
-Subproject commit a38f0319cd5ef48c86ed11fd4a26aeff2f413ad9
+Subproject commit 51b2ebaa1f3cdece3280b1c1e6e2d3850e74e420