Merge "Take snapshot directly during change transition" into qt-dev am: ed057ab244
am: 841ef9cd13

Change-Id: Ida54d74ef9637d8e8a4ea1d1912386b9014e0269