Merge change I86db22ef into eclair

* changes:
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.