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

Change-Id: Ic1f9035509bcbb2b9c2e096a243f1d890425744a