9e8cd05c13
Avoids crash when an old screen is being replaced by a new one
(cherry picked from commit f05e251991)