automerge: 8c01dfc * commit '8c01dfc5af599398c1c79f87619c302e000e3353': QS: Bring back BT/Wi-Fi sub-panels