Merge "Let screenrecord to use viewport in DisplayInfo"