Merge change I12b84853 into eclair

* changes:
  Another candidate for on screen settings UI (opaque).