Merge "DO NOT MERGE.  Integrate add new screen width/height in "dp" configs." into honeycomb-mr2