Merge changes from topic "jan19"

* changes:
  Only notify when transaction was successful.
  Locking to protect SimpleDateFormat.
  Handle thumbnail generation race conditions.
  Consistent content change notifications.