Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I8b9177d90afac8b834d333efc6c22b6b35dceaf8

diff --cc src/plugins/avfoundation/camera/avfcameraservice.mm
index 2079200,966202e..77a145b
--- 1/src/plugins/avfoundation/camera/avfcameraservice.mm
--- 2/src/plugins/avfoundation/camera/avfcameraservice.mm
+++ b/src/plugins/avfoundation/camera/avfcameraservice.mm
@@@ -142,17 -135,10 +142,17 @@@ QMediaControl *AVFCameraService::reques
  void AVFCameraService::releaseControl(QMediaControl *control)
  {
      if (m_videoOutput == control) {
-         m_videoOutput = 0;
          m_session->setVideoOutput(0);
-         delete control;
+         delete m_videoOutput;
+         m_videoOutput = 0;
      }
 +    AVFMediaVideoProbeControl *videoProbe = qobject_cast<AVFMediaVideoProbeControl *>(control);
 +    if (videoProbe) {
 +        m_session->removeProbe(videoProbe);
 +        delete videoProbe;
 +        return;
 +    }
 +
  }
  
  #include "moc_avfcameraservice.cpp"