am 6d2d5623: am e9ea138a: Merge "Revert "Use real screen width/height to...
am 6d2d5623: am e9ea138a: Merge "Revert "Use real screen width/height to calculate aspect ratio"" into jb-dev
* commit '6d2d5623':
Revert "Use real screen width/height to calculate aspect ratio"