Merge "Fix possible NPE when matching accessory version" into rvc-qpr-dev