Merge "Clear associated task when starting activity in a new task."