Merge "[SB Refactor] Add null checks around network capabilities." into udc-dev