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

            // This is the first time we failed -- restart process and

            // retry.

            r.launchFailed = true;

            app.activities.remove(r);

            throw e;

        }