Merge "Support different multi-window compatibility modes"