Merge "Improve notification UI for lockdown VPN."