Merge "Fix bluetooth device shift on pairing" into sc-v2-dev