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