Merge "Only launch an activity in an existing task if activity types match"