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

Change-Id: If5e50bcb172e2fc1bf0416537f43b99a304477e4