Merge "DO NOT MERGE Add notification settings to backup&restore" into pi-dev