Merge "(Vector) Use mutex instead of ConditionalWait for EventhThreadCallback" into...