Merge "Remove UidStateCallbackInfo when uid is gone" into main