Merge "Fix deadlock in StagingManager.getSessions() method" into rvc-dev