Merge "Updates to notif channel blocking UI" into main