Fix game-over lifespan display (take 2)

This is 3 of the 4 commits introduced in #9547 cherry-picked onto a newer master.