Merge "Stop socket listener when terminating by SIGTERM" into rvc-dev