Merge "Fix IndexOutOfBoundsException when accessing RemoteCallbackList" into main