Merge "Better exception handling in RemoteCallbackList" into main