Merge "Use config size for DisplayMetrics when override doesn't exist" into main