Merge "Move displayid into InputEvent"