Merge "Revert "Stop & Resume property service when switching to bootstrap namespace"" into rvc-dev