Merge "Settings: Fix NPE in ChannelNotificationSettings" into oc-dr1-dev