Merge "Fix stale media metadata" into qt-dev