* commit 'd912e1f6a111fb33118d116bd72da1a328041bca': Use the display's actual state in the view hierarchy.