Merge "Allow VPN lockdown UID ranges to stack properly" into main