Merge "Remove invalid window flag" into rvc-dev