Merge "Do not add the noDisplay activity to source task" into main