am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"

* commit 'd22af61d97b938d0c4124fbdaae627f3e85e7084':
  Added catch of SQLiteException when updating screenshot