Merge "Add shell command to control display windowing mode" into main