Merge "[SB Refactor] Don't display the wifi icon if wifi isn't default." into tm-qpr-dev