Merge "Fix onFirstLayout path for saved pages" into ics-mr0

Author: jreck

core/java/android/webkit/WebView.java

@@ -1917,6 +1917,7 @@ public boolean loadViewState(InputStream stream) {
             mLoadedPicture = ViewStateSerializer.deserializeViewState(stream, this);
             mBlockWebkitViewMessages = true;
             setNewPicture(mLoadedPicture, true);
+            mLoadedPicture.mViewState = null;
             return true;
         } catch (IOException e) {
             Log.w(LOGTAG, "Failed to loadViewState", e);
@@ -4355,7 +4356,9 @@ protected void onConfigurationChanged(Configuration newConfig) {
             selectionDone();
         }
         mOrientation = newConfig.orientation;
-        mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT);
+        if (mWebViewCore != null && !mBlockWebkitViewMessages) {
+            mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT);
+        }
     }
 
     /**