Merge "Use display windowing mode if undefined" into rvc-dev