Merge "Only calling finishedwhen all the animations have finished" into qt-qpr1-dev
am: 29b8d32f0d

Change-Id: I1bce705678d5f6669aebf8f415fea0fecf4322e4