Merge "Removing blocking from animation on main thread" into qt-dev