Merge "Bouncer: Use Y coord delta instead of velocity." into tm-dev