Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev