Merge "Only set SYNC flag if >1 track" into udc-qpr-dev