Merge "Revert "BBQ: Clean up acquire states on BQ disconnect""