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