Fix room show/hide

Port #880878 to dev