Merge "Replace Bundle used in IWindowSession#relayout" into main