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