Merge "New activity transitions" into qt-dev