Fix various places that were using the wrong display metrics.

Change-Id: I1ac2a0c4a1b7c851dbc99d26f295c7dd49b0bd5c
3 files changed