Merge change 26115 into eclair

* changes:
  Change to use depressed chiclet when showing diambig resolve list. Fixes bug # 2093651