Merge "Recover when widget preview database is deleted" into jb-ub-now-kermit