am 09f3b9ea: Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev automerge: 8c01dfc5 automerge: caed5a29 * commit '09f3b9ea': QS: Bring back BT/Wi-Fi sub-panels