Merge "In xlarge, use "tab" instead of "window"" into honeycomb-mr1