Merge pull request #2325 from darrachequesne/patch-2

Trigger callback even when joining an already joined room