Merge "Add persistent logging for BT events"