Merge "Prevent windows overlay on VPN dialog" into main