diff --git a/CLOBBER b/CLOBBER
index 469d72c30c5..1ab3b1aebdc 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -18,4 +18,4 @@
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
-Bug 902908 renamed js/src/ion to js/src/jit and required a clobber
\ No newline at end of file
+Add an WebIDL interface for bug 892978 requires a clobber for Windows.
diff --git a/mobile/android/base/GeckoView.java b/mobile/android/base/GeckoView.java
index 6b94691ed30..cb5b7ac0b61 100644
--- a/mobile/android/base/GeckoView.java
+++ b/mobile/android/base/GeckoView.java
@@ -31,9 +31,9 @@ public class GeckoView extends LayerView
 
     public GeckoView(Context context, AttributeSet attrs) {
         super(context, attrs);
+
         TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.GeckoView);
         String url = a.getString(R.styleable.GeckoView_url);
-        boolean doInit = a.getBoolean(R.styleable.GeckoView_doinit, true);
         a.recycle();
 
         if (url != null) {
@@ -46,23 +46,27 @@ public class GeckoView extends LayerView
             Tabs tabs = Tabs.getInstance();
             tabs.attachToContext(context);
         }
+        GeckoProfile profile = GeckoProfile.get(context);
+        BrowserDB.initialize(profile.getName());
         GeckoAppShell.registerEventListener("Gecko:Ready", this);
 
         ThreadUtils.setUiThread(Thread.currentThread(), new Handler());
         initializeView(GeckoAppShell.getEventDispatcher());
-
-        if (!doInit)
-            return;
-
-        GeckoProfile profile = GeckoProfile.get(context);
-        BrowserDB.initialize(profile.getName());
-
         if (GeckoThread.checkAndSetLaunchState(GeckoThread.LaunchState.Launching, GeckoThread.LaunchState.Launched)) {
             GeckoAppShell.setLayerView(this);
             GeckoThread.createAndStart();
         }
     }
 
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+
+        if (hasFocus) {
+            setBackgroundDrawable(null);
+        }
+    }
+
     public void loadUrl(String uri) {
         Tabs.getInstance().loadUrl(uri);
     }
diff --git a/mobile/android/base/resources/layout/shared_ui_components.xml b/mobile/android/base/resources/layout/shared_ui_components.xml
index 5c3d807f229..964cf4283e4 100644
--- a/mobile/android/base/resources/layout/shared_ui_components.xml
+++ b/mobile/android/base/resources/layout/shared_ui_components.xml
@@ -6,13 +6,11 @@
 <!-- This file is used to include shared UI components in different gecko app
      layouts, such as gecko_app.xml and web_app.xml -->
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:gecko="http://schemas.android.com/apk/res-auto">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <org.mozilla.gecko.GeckoView android:id="@+id/layer_view"
-                                 gecko:doinit="false"
-                                 android:layout_width="fill_parent"
-                                 android:layout_height="fill_parent"/>
+    <org.mozilla.gecko.gfx.LayerView android:id="@+id/layer_view"
+                                     android:layout_width="fill_parent"
+                                     android:layout_height="fill_parent"/>
 
     <AbsoluteLayout android:id="@+id/plugin_container"
                     android:background="@android:color/transparent"
diff --git a/mobile/android/base/resources/values/attrs.xml b/mobile/android/base/resources/values/attrs.xml
index 7326099417a..21c616fd46f 100644
--- a/mobile/android/base/resources/values/attrs.xml
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -173,7 +173,6 @@
 
     <declare-styleable name="GeckoView">
         <attr name="url" format="string"/>
-        <attr name="doinit" format="boolean"/>
     </declare-styleable>
 
 </resources>