am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"

* commit '845ed8fdaa34d0f684c93bf4dbadb9162f769235':
  DisplayDevice: initialize mDisplayToken correctly