Merge "DisplayDevice: initialize mDisplayToken correctly"