Merge "MediaProvider: allow in-place updates for media files with incorrect path" into qt-dev