Merge "Update DisplayMetrics even on default display" into nyc-mr1-dev