Merge "Wait for idmap service on current thread" into rvc-dev