Merge "Do not set outActivity if value is null." into oc-dev