Merge "Use real sizes for display metrics" into jb-mr2-dev