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

* commit '34c8499cc0fadea73233b0bd8e33f26811972ad1':
  Added catch of SQLiteException when updating screenshot