Update linux+mac bluetooth state files when using custom pairing
Updated variable name in header
Merge branch 'custom_pair' into responsiveness_test