Merge change 6348

* changes:
  Associate screenshots with original url.