Merge "Package changed/removed listeners for always-on VPN" into nyc-dev