Merge "log when waiting on a servicemanager" into rvc-dev