Merge "[Fix] Bluetooth device ordering" into sc-dev