Merge "Fix startActivities may put activity in new task unexpectedly"