Merge "Refactor Bluetooth Codec settings to dynamic ListPreference" into main