Merge "Stop recognition when shutting down VIS" into lmp-dev