Fix bug appearance to scroll in first rendering.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into 3.0-master