Merge "Avoid error message when destroying key w/o secdiscardable file"