Merge "mediaplayer2: fix state during transitioning" into qt-dev am: 6d99dc8f31
am: 91268332f9

Change-Id: Ic9203a148dbfe1c4e75f1921999291c6633d137f