Merge "End transitions before starting new transition." into qt-dev