Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev