Merge "Prevent showing multiple keyguard dialog in vpn setup UI"