Merge "Don't bring up backup agents in secondary app processes" into oc-dev