Merge "Change PiP stash to be based on velocity rather than position."