Merge change I7f60270f into eclair

* changes:
  ADT/GEL: Reenable config popup when switching from a device with only 1 config