am 4adba5a0: am 5c778c36: am 47277584: am 5c675196: am 83340987: Merge "Use real screen width/height to calculate aspect ratio" into jb-mr1.1-dev

* commit '4adba5a0c2d6f14f1cda5589d7137be3107c6058':
  Use real screen width/height to calculate aspect ratio