Merge "Use "real" display size for computing available densities" into nyc-mr1-dev