Merge "Update multi-window and window-layer flags to new namespace." into main