am f8f1ec37: am eaabe7c8: Merge "Cleanup orphaned workspace items on db upgrade" into ub-now-mister-ugly

* commit 'f8f1ec378ee9176e922eef5ef736e4c257a2d56a':
  Cleanup orphaned workspace items on db upgrade