* commit '8075fe48bf345e4014de9b7bee8def5f4373457c': Fix various places that were using the wrong display metrics.