Merge "Skip checking display windowing mode if TDA is null" into main