Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev