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

Change-Id: I5abf87a064fde39a86c750bcf221816bf77f9ca3