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

Change-Id: Ic85c51c0e434bb88af38fee3503410f370005158