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

Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3

src/plugins/wmf/player/mfplayersession.cpp

@@ -1296,7 +1296,7 @@ void MFPlayerSession::commitRateChange(qreal rate, BOOL isThin)
             // (which might be earlier than the last decoded key frame)
             resetPosition = true;
         } else if (cmdNow == CmdPause) {
-            // If paused, dont reset the position until we resume, otherwise
+            // If paused, don't reset the position until we resume, otherwise
             // a new frame will be rendered
             m_presentationClock->GetCorrelatedTime(0, &hnsClockTime, &hnsSystemTime);
             m_request.setCommand(CmdSeekResume);