Merge "New NIM animation" into qt-dev