Merge "Fix a bug when uid is removed from temp-allowlist." into sc-dev