Merge "Ensure screenshot input monitor is always removed" into sc-v2-dev

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java

@@ -780,6 +780,10 @@ public class ScreenshotController {
             }
             mWindowManager.removeViewImmediate(decorView);
         }
+        // Ensure that we remove the input monitor
+        if (mScreenshotView != null) {
+            mScreenshotView.stopInputListening();
+        }
     }
 
     /**

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java

@@ -315,7 +315,7 @@ public class ScreenshotView extends FrameLayout implements
                 });
     }
 
-    private void stopInputListening() {
+    void stopInputListening() {
         if (mInputMonitor != null) {
             mInputMonitor.dispose();
             mInputMonitor = null;