Merge "TIF: Define activity action to set up channel sources" into nyc-dev