Merge "Start moving away from DisplayMetrics.DENSITY_DEVICE." into jb-mr1-dev