Merge "Track activity launch failure." into oc-dev