am fca328eb: am 021273a5: Merge "Use real sizes for display metrics" into jb-mr2-dev

* commit 'fca328ebf0a190eef510acf0e952fb9762ec93a7':
  Use real sizes for display metrics