Merge "Added catch of SQLiteException when updating screenshot"