Merge "MediaSessionRecord: add synchronize control for modification of mControllerCallbackHolders" into main