When layout changes, we need to recompute the scrollView content size => move this code to layout subviews
Merge commit 'c6310e6b0ba3df677e58aa46b5038913362cfc05'