Merge "Changing the order of width and height in constructing Display.Mode"