Merge change 25261 into eclair

* changes:
  Add menu shortcuts