Merge "Revert "Remove multi-window changes.""