Merge "Prevent activity config override for system processes." into rvc-dev