Merge "Fix bug where we could get stuck repeatedly launching an activity."