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