Merge "Consistently use CPU uptime for temporary allowlist" into main