* commit 'e43684a64c35e3a627037a671d351bda12e5eb0a': Move setting the display state out of the critical section.