Merge "Switch display windowing mode when display connected" into main