automerge: caed5a2 * commit 'caed5a29760ac1a32a0248e518b71d2d6df3d33e': QS: Bring back BT/Wi-Fi sub-panels