Merge "more fixes to monkey motion event timing" into jb-dev