Merge "Explicitly disconnect in MediaPlayer::reset" into mnc-dev