Merge "mediaplayer2: fix state during transitioning" into qt-dev