Merge "Add test for activity with FLAG_ACTIVITY_MULTIPLE_TASK"