Merge "Fix RemoteCallbackListTest#testInspection." into main