am c1eb760c: am 1712a645: am 0ba9bf19: Merge "Use real screen width/height to calculate aspect ratio" * commit 'c1eb760c': Use real screen width/height to calculate aspect ratio