am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2

* commit '8416e5cf0a8439a3f605629068d3639f2a35e08b':
  Fix fake display size when rotated.