Fix #9025 by watching the display expression.