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