V1.3 - GOLD-883: iOS Scroll Fix V2