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