Merge change 6813 into donut

* changes:
  Fixes #1972421. Prevents crash in ScrollView/HorizontalScrollView.