am 78470718: Fix various places that were using the wrong display metrics.

* commit '784707187d96b731df5256c1c2adb0aaf9037239':
  Fix various places that were using the wrong display metrics.