Merge "Fix stale media metadata" into qt-dev
am: 67cec194bd

Change-Id: I70b84be576fffe5899412e9bfce2d6ada9fae53a