Merge "Update DisplayMetrics when resizing" into nyc-mr1-dev