Merge "Improve NetworkCapabilities command chaining." into nyc-dev