Merge "DO NOT MERGE.  Integrate from master: Rework display size access." into honeycomb-mr2