Merge "Merge \\"Update DisplayMetrics when resizing\\" into nyc-dev am: 34ccbe035a am: 40b4ca8435" into nyc-mr1-dev-plus-aosp