Merge "Fix deadlock in StagingManager.getSessions() method"