Merge "Fix the dock-insertion Dream entry codepath." into jb-mr1-dev

Author: John Spurlock

services/java/com/android/server/power/PowerManagerService.java

@@ -426,7 +426,7 @@ public void onReceive(Context context, Intent intent) {
                     }
 
                     // stop the screensaver if we're now unplugged
-                    if (mPolicy != null) {
+                    if (mPolicy != null && wasPowered) {
                         mPolicy.stopScreenSaver();
                     }
                 }