Merge commit 'b3f35041' into eclair-mr2 * commit 'b3f35041': Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database.