Merge "Stop system server depending on the stubs of itself" into rvc-dev