Merge "VPN: cancel always-on notification with new id" into oc-dev