Merge "mediaplayer2: fix state during data source switching" into qt-dev
am: e9e801bff7

Change-Id: I4bb775be95d690e703315d1b227fe1255735cbf5