Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread