Merge "[Thread] fix airplane mode race conditions" into main