Merge "Change channels API to focus on priority channels." into main