Merge "Properly remove fingerprints when removing device lock." into oc-dev