Merge "VIMS should only stop the keyphrases it started." into nyc-dev