Merge "Cleanup references when turning BT off." into ics-mr1