Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev