Merge commit 'b5c735d35c8c1d2fb4e4654fbffcdb62d5acab4d' * commit 'b5c735d35c8c1d2fb4e4654fbffcdb62d5acab4d': Return adjusted display for WindowManager.getDefaultDisplay()
Merge commit 'b5c735d35c8c1d2fb4e4654fbffcdb62d5acab4d' * commit 'b5c735d35c8c1d2fb4e4654fbffcdb62d5acab4d': Return adjusted display for WindowManager.getDefaultDisplay()