Merge "Bluetooth: GAP: Update bonded device info immediately on NVRAM"