Merge commit '7621e2f8dec938cf48181c8b10afc9b01f444e68' into beta

submodules/Display/Source/ListViewScroller.swift

@@ -0,0 +1,48 @@
+import UIKit
+
+public final class ListViewScroller: UIScrollView, UIGestureRecognizerDelegate {
+    override public init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        self.scrollsToTop = false
+        self.contentInsetAdjustmentBehavior = .never
+    }
+    
+    required public init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        if otherGestureRecognizer is ListViewTapGestureRecognizer {
+            return true
+        }
+        return false
+    }
+    
+    override public func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        if gestureRecognizer is UIPanGestureRecognizer, let gestureRecognizers = gestureRecognizer.view?.gestureRecognizers {
+            for otherGestureRecognizer in gestureRecognizers {
+                if otherGestureRecognizer !== gestureRecognizer, let panGestureRecognizer = otherGestureRecognizer as? UIPanGestureRecognizer, panGestureRecognizer.minimumNumberOfTouches == 2 {
+                    return gestureRecognizer.numberOfTouches < 2
+                }
+            }
+            
+            if let view = gestureRecognizer.view?.hitTest(gestureRecognizer.location(in: gestureRecognizer.view), with: nil) as? UIControl {
+                return !view.isTracking
+            }
+            
+            return true
+        } else {
+            return true
+        }
+    }
+    
+    override public func touchesShouldCancel(in view: UIView) -> Bool {
+        return true
+    }
+    
+    var forceDecelerating = false
+    public override var isDecelerating: Bool {
+        return self.forceDecelerating || super.isDecelerating
+    }
+}