Merge "Grants app visibility to both ends of instrumentation" into rvc-dev