Merge \\"Update DisplayMetrics when resizing\\" into nyc-dev am: 34ccbe035a
am: c038c55f62

Change-Id: I7eb3fd5d125cf3e544d306be0824519d6eff3cba