am 44894df5: (-s ours) am 72d29c2d: am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev

* commit '44894df5d79500ade82cc8f250cc8fe70b28af87':