Merge "Fix Missing Screen Density" into gingerbread