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

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