Merge "Fix a NPE when highlighting fingerprint row."