Merge change 26901 into eclair

* changes:
  Move the screenshot button above the image