Merge "Reduce unnecessary window container traversal" into main