am 2f1bd320: 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 '2f1bd320d972f264c337d77235fb45e5ae7228e8':
  Use real screen width/height to calculate aspect ratio