diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index a8e5afc1e..37fb3da26 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -942,6 +942,7 @@ else
 		echo 'android.library.reference.1=../../../../../../../../../../../../../../${sdk.dir}/extras/google/google_play_services/libproject/google-play-services_lib' >> project/local.properties
 		echo 'android.library.reference.2=../../../../../../../../../../../../../../${sdk.dir}/extras/android/compatibility/v7/mediarouter' >> project/local.properties
 		echo 'android.library.reference.3=../../../../../../../../../../../../../../${sdk.dir}/extras/android/compatibility/v7/appcompat' >> project/local.properties
+		echo 'android.library.reference.4=../../../../../../../../../../../../../../${sdk.dir}/extras/android/compatibility/v7/palette' >> project/local.properties
 		echo 'proguard.config=proguard.cfg;proguard-local.cfg' >> project/local.properties
 		ln -s -f $SDK_DIR/extras/android/compatibility/v4/android-support-v4.jar project/libs
 	}
@@ -953,6 +954,9 @@ else
 	}
 	[ -e $SDK_DIR/extras/android/compatibility/v7/appcompat/build.xml ] || \
 		android update project -t android-23 -p $SDK_DIR/extras/android/compatibility/v7/appcompat
+	[ -e $SDK_DIR/extras/android/compatibility/v7/palette/build.xml ] || \
+		android update project -t android-23 -p $SDK_DIR/extras/android/compatibility/v7/palette && \
+		mkdir -p $SDK_DIR/extras/android/compatibility/v7/palette/src
 fi
 
 ln -s -f $SDK_DIR/platforms/android-23/optional/org.apache.http.legacy.jar project/libs
diff --git a/project/java/googleplaygameservices/GameHelper.java b/project/java/googleplaygameservices/GameHelper.java
index 28fa482ea..1004d37f9 100644
--- a/project/java/googleplaygameservices/GameHelper.java
+++ b/project/java/googleplaygameservices/GameHelper.java
@@ -29,7 +29,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 
-import com.google.android.gms.appstate.AppStateManager;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.gms.common.api.Api.ApiOptions.NoOptions;
@@ -289,11 +288,6 @@ public class GameHelper implements GoogleApiClient.ConnectionCallbacks,
             builder.addScope(Plus.SCOPE_PLUS_LOGIN);
         }
 
-        if (0 != (mRequestedClients & CLIENT_APPSTATE)) {
-            builder.addApi(AppStateManager.API);
-            builder.addScope(AppStateManager.SCOPE_APP_STATE);
-        }
-
         if (0 != (mRequestedClients & CLIENT_SNAPSHOT)) {
           builder.addScope(Drive.SCOPE_APPFOLDER);
           builder.addApi(Drive.API);
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index 9a78b6e45..577577a8b 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit 9a78b6e45ea72db332d555834071c39b26585cf1
+Subproject commit 577577a8ba9d50156464bf3088e93c71c19baeac