Merge "[core.room] Fix room scope provider for external ports"