Merge "Don't run postexecute if activity is gone." into oc-dev