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

* commit '72d29c2d0d062122710e4d3d4eed68f04be3b275':