Merge "Support launching an intent and a task from the same app as multi-instance" into tm-dev