Fixed an issue where the activity indicator would pause on a scrollview.
Merge remote-tracking branch 'origin/master'