Merge "Fix fake display size when rotated." into honeycomb-mr2