Merge "Add case with DisplayMetrics.DENSITY_XXHIGH to cover fullHD resolution and adjust the bound of condition."