improve to avoid misoperation  when scroll the child view to the border and continue scroll.
Merge remote-tracking branch 'origin/master'