Merge "Fix the ClassCastException of ChannelNotificationSettings"