Merge "Remove WindowList" into main