diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index 6cb3b838b6..143309405f 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.retroarch"
-    android:versionCode="14"
+    android:versionCode="15"
     android:versionName="0.9.9" >
 	<uses-feature android:glEsVersion="0x00020000" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
diff --git a/settings.c b/settings.c
index e1afb03784..60650cfb76 100644
--- a/settings.c
+++ b/settings.c
@@ -254,6 +254,11 @@ void config_set_defaults(void)
    for (int i = 0; i < MAX_PLAYERS; i++)
       g_settings.input.joypad_map[i] = i;
 
+   g_extern.console.screen.viewports.custom_vp.width = 0;
+   g_extern.console.screen.viewports.custom_vp.height = 0;
+   g_extern.console.screen.viewports.custom_vp.x = 0;
+   g_extern.console.screen.viewports.custom_vp.y = 0;
+
 #ifdef RARCH_CONSOLE
    g_extern.lifecycle_mode_state |= ((1ULL << MODE_INFO_DRAW) | (1ULL << MODE_MENU));
 
@@ -283,10 +288,6 @@ void config_set_defaults(void)
    g_extern.verbose = true;
 
    g_extern.console.sound.mode = SOUND_MODE_NORMAL;
-   g_extern.console.screen.viewports.custom_vp.width = 0;
-   g_extern.console.screen.viewports.custom_vp.height = 0;
-   g_extern.console.screen.viewports.custom_vp.x = 0;
-   g_extern.console.screen.viewports.custom_vp.y = 0;
 #ifdef _XBOX1
    g_extern.console.sound.volume_level = 0;
 #endif
@@ -583,11 +584,12 @@ bool config_load_file(const char *path)
    CONFIG_GET_INT_EXTERN(audio_data.mute, "audio_mute");
    CONFIG_GET_INT_EXTERN(console.screen.orientation, "screen_orientation");
    CONFIG_GET_INT_EXTERN(console.sound.mode, "sound_mode");
+#endif
+
    CONFIG_GET_INT_EXTERN(console.screen.viewports.custom_vp.x, "custom_viewport_x");
    CONFIG_GET_INT_EXTERN(console.screen.viewports.custom_vp.y, "custom_viewport_y");
    CONFIG_GET_INT_EXTERN(console.screen.viewports.custom_vp.width, "custom_viewport_width");
    CONFIG_GET_INT_EXTERN(console.screen.viewports.custom_vp.height, "custom_viewport_height");
-#endif
 
    unsigned msg_color = 0;
    if (config_get_hex(conf, "video_message_color", &msg_color))