Merge "Clear reference to DreamActivity window." into tm-dev

core/java/android/service/dreams/DreamService.java

@@ -1341,7 +1341,9 @@ public class DreamService extends Service implements Window.Callback {
                     public void onViewDetachedFromWindow(View v) {
                         if (mActivity == null || !mActivity.isChangingConfigurations()) {
                             // Only stop the dream if the view is not detached by relaunching
-                            // activity for configuration changes.
+                            // activity for configuration changes. It is important to also clear
+                            // the window reference in order to fully release the DreamActivity.
+                            mWindow = null;
                             mActivity = null;
                             finish();
                         }