Merge change 26713 into eclair

* changes:
  Set selection in single choice list. Reorder the menu entries to use the menu options as indices into the choice box directly