Merge "Paired BT devices are not displaying in volume control panel" into sc-dev