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