Merge "Bluetooth: BLE app tracking fixes"