Merge "Fix animation sequence for upload tasks" am: 7f2676a3d9
am: b5fed003cc

Change-Id: I2b7e8e684aa449d317db9f1b85d8d768bbf8e7ec