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