Merge "Update logic about parent and convo channels" into sc-dev