Merge "BT: Synchronize Bond SM message processing and cleanup"