diff --git a/Resources/ui/common/baseui/window_properties.js b/Resources/ui/common/baseui/window_properties.js
index ef94a61f..2dcf074e 100644
--- a/Resources/ui/common/baseui/window_properties.js
+++ b/Resources/ui/common/baseui/window_properties.js
@@ -110,12 +110,6 @@ function win_props(_args) {
 	var win2 = null;
 	buttonLayout.addEventListener('click', function()
 	{	
-		if(Ti.Platform.osname == 'blackberry') {
-			Ti.BlackBerry.createToastNotification({
-				message: 'Test invalid for BlackBerry'
-			}).show();
-			return;
-		}
 		if (layout)
 		{
 			win1 = Titanium.UI.createWindow({
@@ -154,7 +148,11 @@ function win_props(_args) {
 			layout=true;
 		}
 	});
-	win.add(buttonLayout);
+	// Layout test is not valid for BlackBerry or Android
+	var osname = Ti.Platform.osname;
+	if (osname != 'blackberry' && osname != 'android') {
+		win.add(buttonLayout);
+	}
 	
 	//
 	// TOGGLE BORDER PROPERTIES
diff --git a/tiapp.xml b/tiapp.xml
index e2bd5124..002af258 100644
--- a/tiapp.xml
+++ b/tiapp.xml
@@ -8,9 +8,8 @@
         <target device="android">true</target>
         <target device="blackberry">true</target>
     </deployment-targets>
-    <property name="ti.android.useLegacyWindow" type="bool">true</property>
     <property name="ti.ui.defaultunit" type="string">dp</property>
-    <sdk-version>3.3.0.GA</sdk-version>
+    <sdk-version>3.4.0</sdk-version>
     <id>com.appcelerator.kitchensink</id>
     <name>KitchenSink</name>
     <version>3.3.0</version>
@@ -77,7 +76,7 @@
             <permission>run_when_backgrounded</permission>
             <permission>access_sms_mms</permission>
         </permissions>
-    </blackberry> 
+    </blackberry>
     <tizen appid="nmgg3ski3z" xmlns:tizen="http://ti.appcelerator.org">
         <tizen:privilege name="http://tizen.org/privilege/alarm"/>
         <tizen:privilege name="http://tizen.org/privilege/application.launch"/>