Merge "Delay rendering into Surface until draw completed."

Author: Craig Mautner

services/java/com/android/server/wm/WindowStateAnimator.java

@@ -978,7 +978,7 @@ public void prepareSurfaceLocked(final boolean recoveringMemory) {
 
         setSurfaceBoundaries(recoveringMemory);
 
-        if (w.mAttachedHidden || !w.isReadyForDisplay()) {
+        if (w.mAttachedHidden || !w.isReadyForDisplay() || !w.isDrawnLw()) {
             if (!mLastHidden) {
                 //dump();
                 mLastHidden = true;