Merge pull request #7814 from JosJuice/overwrite-aspect-mode VideoConfig: Don't overwrite aspect_mode with suggested_aspect_mode
