Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop'