Merge "Fix Notification settings upon installation after Restore."