Updated scrolling for iOS 8
Merge branch 'iOS8_scrolling' into simplify_proxy