Merge "Add new fields to fingerprint PointerContext"