Merge "Update scanresult capability check"