Merged main

diff --cc nvdaHelper/interfaces/displayModel/displayModel.acf
Simple merge

diff --cc nvdaHelper/interfaces/displayModel/displayModel.idl
Simple merge

diff --cc nvdaHelper/interfaces/nvdaControllerInternal/nvdaControllerInternal.acf
Simple merge

diff --cc nvdaHelper/interfaces/nvdaControllerInternal/nvdaControllerInternal.idl
Simple merge

diff --cc nvdaHelper/local/nvdaControllerInternal.c
Simple merge

diff --cc nvdaHelper/remote/displayModelRemote.cpp
Simple merge

diff --cc nvdaHelper/remote/gdiHooks.cpp
Simple merge

diff --cc nvdaHelper/remote/gdiHooks.h
Simple merge

diff --cc nvdaHelper/vbufBackends/adobeAcrobat/adobeAcrobat.cpp
Simple merge