Remove scheduleDeferred calls from Escalator

Change-Id: Idfde7842fd31be4b84a1436b40eaa932b6a6c349

client/src/com/vaadin/client/widgets/Escalator.java

@@ -1878,7 +1878,7 @@ public class Escalator extends Widget implements RequiresResize,
         }
 
         public void autodetectRowHeightLater() {
-            Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() {
+            Scheduler.get().scheduleFinally(new Scheduler.ScheduledCommand() {
                 @Override
                 public void execute() {
                     if (defaultRowHeightShouldBeAutodetected && isAttached()) {
@@ -5946,7 +5946,7 @@ public class Escalator extends Widget implements RequiresResize,
     public void scrollToRow(final int rowIndex,
             final ScrollDestination destination, final int padding)
             throws IndexOutOfBoundsException, IllegalArgumentException {
-        Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+        Scheduler.get().scheduleFinally(new ScheduledCommand() {
             @Override
             public void execute() {
                 validateScrollDestination(destination, padding);
@@ -6017,7 +6017,7 @@ public class Escalator extends Widget implements RequiresResize,
     public void scrollToRowAndSpacer(final int rowIndex,
             final ScrollDestination destination, final int padding)
             throws IllegalArgumentException {
-        Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+        Scheduler.get().scheduleFinally(new ScheduledCommand() {
             @Override
             public void execute() {
                 validateScrollDestination(destination, padding);
@@ -6435,7 +6435,7 @@ public class Escalator extends Widget implements RequiresResize,
     @Override
     public boolean isWorkPending() {
         return body.domSorter.waiting || verticalScrollbar.isWorkPending()
-                || horizontalScrollbar.isWorkPending();
+                || horizontalScrollbar.isWorkPending() || layoutIsScheduled;
     }
 
     @Override