Merge "Protect VPN dialogs against overlay." into nyc-dev