Update scroller Layout.
Merge remote-tracking branch 'origin/master'
Update scroller Layout.