--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
@@ -78,16 +78,21 @@ public class GeckoThread extends Thread 
 
         @Override
         public boolean isAtLeast(final NativeQueue.State other) {
             if (other instanceof State) {
                 return this.rank >= ((State) other).rank;
             }
             return false;
         }
+
+        @Override
+        public String toString() {
+            return name();
+        }
     }
 
     private static final NativeQueue sNativeQueue =
         new NativeQueue(State.INITIAL, State.RUNNING);
 
     /* package */ static NativeQueue getNativeQueue() {
         return sNativeQueue;
     }
@@ -490,23 +495,27 @@ public class GeckoThread extends Thread 
      * @return True if the current Gecko thread state matches
      */
     public static boolean isStateBetween(final State minState, final State maxState) {
         return isStateAtLeast(minState) && isStateAtMost(maxState);
     }
 
     @WrapForJNI(calledFrom = "gecko")
     private static void setState(final State newState) {
-        sNativeQueue.setState(newState);
+        checkAndSetState(null, newState);
     }
 
     @WrapForJNI(calledFrom = "gecko")
     private static boolean checkAndSetState(final State expectedState,
                                             final State newState) {
-        return sNativeQueue.checkAndSetState(expectedState, newState);
+        final boolean result = sNativeQueue.checkAndSetState(expectedState, newState);
+        if (result) {
+            Log.d(LOGTAG, "State changed to " + newState);
+        }
+        return result;
     }
 
     @WrapForJNI(stubName = "SpeculativeConnect")
     private static native void speculativeConnectNative(String uri);
 
     public static void speculativeConnect(final String uri) {
         // This is almost always called before Gecko loads, so we don't
         // bother checking here if Gecko is actually loaded or not.