Merge "Notification listener backup & restore"