(cherry picked from commit fffa6a004cf074caf0cf5c8ae1408a80500859fa)
(cherry picked from commit 257d9d13ac81d85583314f8b5dfabf05661b1572)
(cherry picked from commit 58e65afb45fbc675186e470cc4a268d9eaa2a539)
Stops filtered rooms from briefly displaying.