Merge "wait for disable event callback to complete"