Merge "Handle channel changes for bubbles"