Merge "Enable fingerprint cleanup upon connection to daemon and upon user switches"