[bugfix] iOS5 bug for scrollTop trace784
Merge remote-tracking branch 'origin/dev' into dev