Merge "Synchronize adapter registration with mCallbacks"