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

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