Merge "Compare supported modes in DisplayInfo.equals()"