Merge commit 'a11fe86d77e0fd57944e5615acb58b41a4fb4e93' * commit 'a11fe86d77e0fd57944e5615acb58b41a4fb4e93': Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView.
Merge commit 'a11fe86d77e0fd57944e5615acb58b41a4fb4e93' * commit 'a11fe86d77e0fd57944e5615acb58b41a4fb4e93': Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView.