Merge commit '25cb418eb3e1bef98f90d5c77c42de1d3f27d0e2'

# Conflicts:
#	TelegramUI/ChannelInfoController.swift
#	TelegramUI/SettingsController.swift

TelegramUI/GalleryThumbnailContainerNode.swift

@@ -205,4 +205,16 @@ final class GalleryThumbnailContainerNode: ASDisplayNode, UIScrollViewDelegate {
             delay += 0.01
         }
     }
+    
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        
+    }
+    
+    func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
+        
+    }
+    
+    func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
+        
+    }
 }