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

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