Rebasing CrashStories onto newer Shareabouts code