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

Change-Id: I07faceb1ac0186f2f60a9b28670ccd9ef667dd74