Merge "KeyChain: Remove Screenlock dependency"