Revert of Revert of Special check on Supervised User creation flow added to prevent misleading ..

ash/shelf/shelf_layout_manager.cc

Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index 08831e24dfb194a5692e01d817225290c311725f..77cab17d37e5cbdc6a31517365051bb20e525f06 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -252,7 +252,8 @@
     return false;
 
   alignment_ = alignment;
-  if (state_.is_screen_locked || state_.is_adding_user_screen) {
+  if (Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked() ||
+      state_.is_adding_user_screen) {
     // The shelf will itself move to the bottom while locked. If a request is
     // sent to move while being locked, we postpone the move until the lock
     // screen goes away.
@@ -270,7 +271,8 @@
   // bottom alignment. Note: We cannot use state_.is_screen_locked here since
   // that flag gets set later than the SessionStateDelegate reports a locked
   // screen which leads in
-  if (state_.is_screen_locked || state_.is_adding_user_screen)
+  if (Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked() ||
+      state_.is_adding_user_screen)
     return SHELF_ALIGNMENT_BOTTOM;
   return alignment_;
 }