Merge "Migrate task intent/info to new task only if source task is empty" into tm-dev