Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop