V2.0 - GOLD-883: iOS Scroll Fix V2