Merge "Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev am: a781232656 am: 117c975fe2" into nyc-mr1-dev-plus-aosp