Merge "Add Notification bubbles setting to the validators to fix tests"