Layout login/lock screen, shelf and app list inside the first display in Unified Desktop mode

ash/wm/app_list_controller.cc

Index: ash/wm/app_list_controller.cc
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
index 46b28b69215cb54943c5ee8c280f225cb2926bc9..4dbd3af502fc44c97dc8e9d64b16558543c220d4 100644
--- a/ash/wm/app_list_controller.cc
+++ b/ash/wm/app_list_controller.cc
@@ -124,8 +124,8 @@ gfx::Vector2d GetAnchorPositionOffsetToShelf(
 // that height (so that the app list never starts above the top of the screen).
 gfx::Point GetCenterOfDisplayForView(const views::View* view,
                                      int minimum_height) {
-  gfx::Rect bounds = Shell::GetScreen()->GetDisplayNearestWindow(
-      view->GetWidget()->GetNativeView()).bounds();
+  aura::Window* window = view->GetWidget()->GetNativeView();
+  gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInScreen(window);
 
   // If the virtual keyboard is active, subtract it from the display bounds, so
   // that the app list is centered in the non-keyboard area of the display.