Merge "Consolidate fingerprint overlay controllers." into sc-v2-dev