am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev

* commit 'ddbfdfa530a02e75402ff9c570c4420b94811b8e':
  fix race condition when a new display is added