Merge "Fix race condition in releasedCallback test"