Merge "Move setting the display state out of the critical section." into lmp-dev