Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev