Merge \\"Use \\"real\\" display size for computing available densities\\" into nyc-mr1-dev am: ad126d3b8b
am: e236079acb

Change-Id: I3c2145349415dfda8f4e1ce6b997f36ff84eea86