Merge "Respect Accessory timeout value when restoring defaults"