Merge "Ensure process config override tracks the correct activity." into rvc-dev