Merge change 26495 into eclair

* changes:
  Disable menu items based on device/app selection.