automerge: bdf37b7 * commit 'bdf37b714d4c3e3fb0ac27c625fdcffbd616b4f9': SysUI: Refactor the NetworkControllerImpl