Merge change 7106 into donut

* changes:
  Return adjusted display for WindowManager.getDefaultDisplay()