Merge "Update DisplayMetrics even on default display" into nyc-mr1-dev
am: 4510b9af38

Change-Id: I530609c9e89ebc9054c57e5614fa1465289f82da