Merge "The layout height should be the value scaled by the density." into froyo