am a3a37fd2: 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 'a3a37fd25b7c93e1ce0d5141104a8df0fd0fca5c':
  Revert "Use real screen width/height to calculate aspect ratio"