Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev