Merge "Fix launching of activities that I broke."