am e6b407b4: Merge "MediaSync: fix flush handling and deadlock" into mnc-dev

* commit 'e6b407b4be0b9c8240d34259b14e324da4d6832b':
  MediaSync: fix flush handling and deadlock