DAR-36: finish the rest of the photo tool tracking.
Merge pull request #579 from Wikia/DAR-36

DAR-36: finish the rest of the photo tool tracking.