Merge "Fix settings test for show_notification_channel_warnings" into oc-dev