Merge "fix flush on HW A/V sync tracks"