* changes: Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev DO NOT MERGE - Merge PPRL.190205.001 into master
* changes: Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev DO NOT MERGE - Merge PPRL.190205.001 into master