am e9ea138a: Merge "Revert "Use real screen width/height to calculate aspect ratio"" into jb-dev

* commit 'e9ea138a3ba5e2f96e4829d0a5c2ab039e7c5599':
  Revert "Use real screen width/height to calculate aspect ratio"