Merge branch 'feature/block-if-room-full-or-closed-updated' into feature/ux-changes-3-with-remount-refactor