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

* commit 'ec63cd85c8b7f90a39e04aeec560fea7ea973b9a':
  DO NOT MERGE Return 1.5 * density as default for large screens.