Merge \"Fixing a crash on APPS->WORKSPACE transition when animation is automated without dragging. b/29424335\" into ub-launcher3-calgary
am: 91f3b1c0b8

Change-Id: I0ccb23006e7958a2a325233e284a99168e48494c