Merge change 8740 into donut

* changes:
  Fix issue #1991230: DisplayMetrics.displayHeight is not updated with orientation change