Merge "Disable activity process config override for certain display-based services." into rvc-dev