am 096762d6: am 8075fe48: am 78470718: Fix various places that were using the wrong display metrics.

* commit '096762d6efcae6300c02919bc6b3eaeeffccf91d':
  Fix various places that were using the wrong display metrics.