Ensuring table row operations are on UI thread
Merge branch 'table-ensure-uithread' into 2_1_X-picsafe

* table-ensure-uithread:
  Ensuring table row operations are on UI thread