Merge "Fixing deadlock in dagger singletons" into main