Merge "Fix jumpiness when dragging surface down and up." into tm-qpr-dev