Show room notifications if the room is not active
Merge master and fix merge conflicts