Merge "Revert^2 "Frozen-aware RemoteCallbackList"" into main