Merge "Add activity options flag to force launching an activity in a new task"