Merge "Protect notification callback parameters with a mutex." into honeycomb