adds shouldScroll to delegate
Merge commit 'e2e63eb'