Merge "Allow mainline modules to set private window flags"