Merge "Clean up listener when car disconnected" into nyc-dev