Merge "MediaSync: map returned output buffers to previously received input buffers." into mnc-dev