Revert "Core/Keyguard: Cleanup CAF additions"

This reverts commit ccb81ac907bef7e2cafc507c36bd925d8d4b63d3.