am 99dea349: am 1eb690c2: am 9628568a: am e6b407b4: Merge "MediaSync: fix flush handling and deadlock" into mnc-dev

* commit '99dea349513e307081622f6d11c3b40ee3dcce82':
  MediaSync: fix flush handling and deadlock