Merge "Mock DisplayMetrics to fix tests"