Merge pull request #8829 from stenzek/fix-macos-again Core: Use window instead of surface for ControllerInterface updates
