Merge "DO NOT MERGE Speculative fix for BT race condition" into pi-dev