am b3f35041: Merge change I86db22ef into eclair

Merge commit 'b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6' into eclair-mr2

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