Merge "Add notification settings to backup&restore"