Merge "Add falsing protection for all notification settings guts" into rvc-dev