Merge "Replace duplicate with onWindowInfosChanged" into main