Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and...

Merge "NuPlayer::GenericSource::onPrepareAsync():Change lock order mLock and mDisconnect lock order interleaving, which has potential risk of deadlock if other code locks/unlocks them in a different order." into qt-dev