Merge "Properly note the current active restore set's token" into froyo