Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev