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