Merge "MediaSync: fix the optimization code path to reduce messages posted to drain video."