am 83340987: Merge "Use real screen width/height to calculate aspect ratio" into jb-mr1.1-dev

* commit '8334098790a8bbc1b04bb50461e40a920eb5e964':
  Use real screen width/height to calculate aspect ratio