diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index aa9bd99147e7f22870b672b98442040608858f70..dcda60c9a4fdbb2a6bf16c16738303a1cc1edfc9 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -166,36 +166,40 @@ OSGDependency {
 # [OPTIONAL] Google Earth dependency. Provides Google Earth view to supplement 2D map view.
 # Only supported on Mac and Windows where Google Earth can be installed.
 #
-contains(DEFINES, DISABLE_GOOGLE_EARTH) {
-    message("Skipping support for Google Earth view (manual override from command line)")
-    DEFINES -= DISABLE_GOOGLE_EARTH
-}
-# Otherwise the user can still disable this feature in the user_config.pri file.
-else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_GOOGLE_EARTH) {
-    message("Skipping support for Google Earth view (manual override from user_config.pri)")
-} else:MacBuild {
-    message("Including support for Google Earth view")
-    DEFINES += QGC_GOOGLE_EARTH_ENABLED
-    HEADERS += src/ui/map3D/QGCGoogleEarthView.h \
-                src/ui/map3D/QGCWebPage.h \
-                src/ui/QGCWebView.h
-    SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \
-                src/ui/map3D/QGCWebPage.cc \
-                src/ui/QGCWebView.cc
-    FORMS += src/ui/QGCWebView.ui
-} else:WindowsBuild {
-    message("Including support for Google Earth view")
-    DEFINES += QGC_GOOGLE_EARTH_ENABLED
-    HEADERS += src/ui/map3D/QGCGoogleEarthView.h \
-                src/ui/map3D/QGCWebPage.h \
-                src/ui/QGCWebView.h
-    SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \
-                src/ui/map3D/QGCWebPage.cc \
-                src/ui/QGCWebView.cc
-    FORMS += src/ui/QGCWebView.ui
-    QT += axcontainer
+GoogleEarthDisableOverride {
+    contains(DEFINES, DISABLE_GOOGLE_EARTH) {
+        message("Skipping support for Google Earth view (manual override from command line)")
+        DEFINES -= DISABLE_GOOGLE_EARTH
+    }
+    # Otherwise the user can still disable this feature in the user_config.pri file.
+    else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_GOOGLE_EARTH) {
+        message("Skipping support for Google Earth view (manual override from user_config.pri)")
+    } else:MacBuild {
+        message("Including support for Google Earth view")
+        DEFINES += QGC_GOOGLE_EARTH_ENABLED
+        HEADERS += src/ui/map3D/QGCGoogleEarthView.h \
+                    src/ui/map3D/QGCWebPage.h \
+                    src/ui/QGCWebView.h
+        SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \
+                    src/ui/map3D/QGCWebPage.cc \
+                    src/ui/QGCWebView.cc
+        FORMS += src/ui/QGCWebView.ui
+    } else:WindowsBuild {
+            message("Including support for Google Earth view")
+            DEFINES += QGC_GOOGLE_EARTH_ENABLED
+            HEADERS += src/ui/map3D/QGCGoogleEarthView.h \
+                        src/ui/map3D/QGCWebPage.h \
+                        src/ui/QGCWebView.h
+            SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \
+                        src/ui/map3D/QGCWebPage.cc \
+                        src/ui/QGCWebView.cc
+            FORMS += src/ui/QGCWebView.ui
+            QT += axcontainer
+    } else {
+        message("Skipping support for Google Earth view (unsupported platform)")
+    }
 } else {
-    message("Skipping support for Google Earth view (unsupported platform)")
+    message("Skipping support for Google Earth due to Issue 1157")
 }
 
 #
diff --git a/files/images/px4/boards/px4fmu_2.x.png b/files/images/px4/boards/px4fmu_2.x.png
index 0a26a6883e64f5438de9d22b6c6bb322818eb81f..55e7d9060c379bf0675d99d0f6f81c09e41afa29 100644
Binary files a/files/images/px4/boards/px4fmu_2.x.png and b/files/images/px4/boards/px4fmu_2.x.png differ
diff --git a/files/images/splash.png b/files/images/splash.png
index 4cfe6a704302eba060ab59c01b9226ed1383db3f..32cace384eec0ad6716d7d4d2f04ca26f220cb47 100644
Binary files a/files/images/splash.png and b/files/images/splash.png differ
diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 17e99b26754d9a0129c0b5156b1b8dbbffa9d351..81bcdd2a62cd5b35c2b1a4c1f1c7aca16d1c6692 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -97,6 +97,8 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) :
     Q_ASSERT(_app == NULL);
     _app = this;
     
+    // This prevents usage of QQuickWidget to fail since it doesn't support native widget siblings
+    setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
     
 #ifdef QT_DEBUG
     // First thing we want to do is set up the qtlogging.ini file. If it doesn't already exist we copy
diff --git a/src/QGCQmlWidgetHolder.cpp b/src/QGCQmlWidgetHolder.cpp
index 75beeb7d10278cfa889ac549e0dc19556e871f70..986633c5e0eec7e4972c1412daa7db0c35db1b33 100644
--- a/src/QGCQmlWidgetHolder.cpp
+++ b/src/QGCQmlWidgetHolder.cpp
@@ -30,6 +30,7 @@ QGCQmlWidgetHolder::QGCQmlWidgetHolder(QWidget *parent) :
     QWidget(parent)
 {
     _ui.setupUi(this);
+    _ui.qmlWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
 }
 
 QGCQmlWidgetHolder::~QGCQmlWidgetHolder()
diff --git a/src/VehicleSetup/SetupView.cc b/src/VehicleSetup/SetupView.cc
index 9149f1db09f92f869ce7e65b98840d8730344887..c1ec1106bf5a9e6c64d20555110b7014da40e294 100644
--- a/src/VehicleSetup/SetupView.cc
+++ b/src/VehicleSetup/SetupView.cc
@@ -49,6 +49,8 @@ SetupView::SetupView(QWidget* parent) :
     Q_UNUSED(fSucceeded);
     Q_ASSERT(fSucceeded);
     
+    setResizeMode(SizeRootObjectToView);
+    
     _setActiveUAS(NULL);
 }
 
diff --git a/src/VehicleSetup/SetupViewConnected.qml b/src/VehicleSetup/SetupViewConnected.qml
index b0857fd14735eb2008010141017a4d1771b35f51..cd2956d620cc312c7c724fb7362f8f751b199d82 100644
--- a/src/VehicleSetup/SetupViewConnected.qml
+++ b/src/VehicleSetup/SetupViewConnected.qml
@@ -9,7 +9,6 @@ Rectangle {
     id: topLevel
     objectName: "topLevel"
 
-    anchors.fill: parent
     color: palette.window
 
     signal buttonClicked(variant component);
diff --git a/src/VehicleSetup/SetupViewDisconnected.qml b/src/VehicleSetup/SetupViewDisconnected.qml
index 37e0a35cb9deff7d82359824415650cb04440891..5ab982909fee39c8c03aff4a9e1a56c092d6fefb 100644
--- a/src/VehicleSetup/SetupViewDisconnected.qml
+++ b/src/VehicleSetup/SetupViewDisconnected.qml
@@ -6,7 +6,6 @@ import QGroundControl.FactSystem 1.0
 Rectangle {
     QGCPalette { id: palette; colorGroup: QGCPalette.Active }
 
-    anchors.fill: parent
     color: palette.window
 
     Item {