fix deadlock on startup due to service initialization from background thread (PY-8724)
IDEA-90296 Consolidating Bookmarks, Favorites, and Todos for consistency and a simpler use
Merge remote-tracking branch 'origin/master'