diff --git a/platform/android/sdk/src/com/ansca/corona/purchasing/StoreActivity.java b/platform/android/sdk/src/com/ansca/corona/purchasing/StoreActivity.java
index bba207976..55da23a61 100644
--- a/platform/android/sdk/src/com/ansca/corona/purchasing/StoreActivity.java
+++ b/platform/android/sdk/src/com/ansca/corona/purchasing/StoreActivity.java
@@ -57,34 +57,28 @@ protected void onCreate(android.os.Bundle savedInstanceState) {
 			return;
 		}
 
-		// Set up this activity as a portrait only window.
-		int orientation = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-		if (android.os.Build.VERSION.SDK_INT >= 9) {
-			orientation = 7;		// android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
-		}
-
-
-		if (android.os.Build.VERSION.SDK_INT <= 34) {
+		// Only lock orientation on devices that don’t support multi-window / resizable
+		if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.N) {
+			int orientation = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+			if (android.os.Build.VERSION.SDK_INT >= 9) {
+				orientation = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
+			}
 			setRequestedOrientation(orientation);
 		}
 
-
-		// Display this activity full screen if requested to do so via the intent's extras.
+		// Display this activity full screen if requested
 		boolean isFullScreen = getIntent().getBooleanExtra(EXTRA_FULL_SCREEN, false);
 		if (isFullScreen) {
 			getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN);
 			getWindow().clearFlags(android.view.WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
-		}
-		else {
+		} else {
 			getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
 			getWindow().clearFlags(android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		}
 
-		// Initialize this flag to false.
-		// We must wait for this activity to be shown onscreen before displaying the Nook store dialog.
+		// Initialize this flag to false
 		fHasShownStore = false;
 	}
-	
 	/** This method is called when this activity can be interacted with. */
 	@Override
 	protected void onResume() {
diff --git a/subrepos/composer b/subrepos/composer
index 1871c7ec1..aef2ec0fc 160000
--- a/subrepos/composer
+++ b/subrepos/composer
@@ -1 +1 @@
-Subproject commit 1871c7ec1d742d28f6bbf1ca2a5094991fb44a1b
+Subproject commit aef2ec0fc3471d179a5b3c8d8b18599d380522fa
diff --git a/subrepos/enterprise b/subrepos/enterprise
index 6ccc3b35b..2238e7a61 160000
--- a/subrepos/enterprise
+++ b/subrepos/enterprise
@@ -1 +1 @@
-Subproject commit 6ccc3b35bf092b4f8e7035339cd6e31ff670a15f
+Subproject commit 2238e7a61304eb2a180f449da197881bd9db90b8
diff --git a/tools/buildsys-ios/libtemplate/Defaults.lua b/tools/buildsys-ios/libtemplate/Defaults.lua
index ce7dee3b8..9211692a2 100644
--- a/tools/buildsys-ios/libtemplate/Defaults.lua
+++ b/tools/buildsys-ios/libtemplate/Defaults.lua
@@ -166,6 +166,7 @@ function M:updateFlags( minVersion )
 		'-std=c++11',
 		'-stdlib=libc++',
 		'-Xlinker -rpath -Xlinker /usr/lib/swift -Xlinker -rpath -Xlinker @executable_path/Frameworks',
+		'-Xlinker -undefined -Xlinker dynamic_lookup',
 	}
 end