am 984bed19: am 1e7be6f4: am e43684a6: am 42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev

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