am 589787a2: am 6d2d5623: am e9ea138a: Merge "Revert "Use real screen width/height to calculate aspect ratio"" into jb-dev * commit '589787a2': Revert "Use real screen width/height to calculate aspect ratio"