Merge "Put ResovlerActivity and noDisplay activities in the source task"