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

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