Merge "Notify on restore" into pi-dev