Merge "Fix issue #3505861: Need to decide large/xlarge screen size limits" into honeycomb-mr1