Merge "Update some policy around multi-window windowing mode" into rvc-dev