Merge "Revert "Use WindowInfosListener for TPL"" into main