Merge "Only take vertical, upward velocity into account for escaping the dismiss target." into rvc-dev