Merge "Blocking client thread during animation frames" into qt-dev am: e808c1e6f5
am: dd275272a1

Change-Id: Ib8480141ba076e97b0ab92c428fa50e9e06cf134