Merge "Clean up variables when closing BT" into pi-dev