Merge \\"Update DisplayMetrics when resizing\\" into nyc-mr1-dev am: 038084e61c
am: 89aea239cd

Change-Id: I9cc73d39e690d30c736b705235bb93e92bd029a6