Merge "Synchronize adapter registration with mCallbacks" into rvc-dev