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

Change-Id: I28c48d01368afbaa37de88711f2caa27a6ea7457