Merge "tempAllowList duration can be updated if an UID is already temp allowlisted." into sc-qpr1-dev