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

Change-Id: I31d905372f37c3002212d3b7f49144e0b7812269