Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev