Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2