Merge "Take snapshot directly during change transition" into qt-dev