Merge "Unset activity type for process level configuration" into rvc-qpr-dev